Autogenerated HTML docs for v1.5.1.1-135-gf948
diff --git a/git-checkout.html b/git-checkout.html index 6bc77b5..e67e39b 100644 --- a/git-checkout.html +++ b/git-checkout.html
@@ -286,9 +286,9 @@ options, which will be passed to <tt>git branch</tt>.</p> <p>When <paths> are given, this command does <strong>not</strong> switch branches. It updates the named paths in the working tree from -the index file (i.e. it runs <tt>git-checkout-index -f -u</tt>), or a -named commit. In -this case, <tt>-f</tt> and <tt>-b</tt> options are meaningless and giving +the index file (i.e. it runs <tt>git-checkout-index -f -u</tt>), or +from a named commit. In +this case, the <tt>-f</tt> and <tt>-b</tt> options are meaningless and giving either of them results in an error. <tree-ish> argument can be used to specify a specific tree-ish (i.e. commit, tag or tree) to update the index for the given paths before updating the @@ -310,7 +310,8 @@ </dt> <dd> <p> - Force a re-read of everything. + Proceed even if the index or the working tree differs + from HEAD. This is used to throw away local changes. </p> </dd> <dt> @@ -330,8 +331,11 @@ <dd> <p> When -b is given and a branch is created off a remote branch, - setup so that git-pull will automatically retrieve data from - the remote branch. + set up configuration so that git-pull will automatically + retrieve data from the remote branch. Set the + branch.autosetupmerge configuration variable to true if you + want git-checkout and git-branch to always behave as if + <em>--track</em> were given. </p> </dd> <dt> @@ -340,8 +344,9 @@ <dd> <p> When -b is given and a branch is created off a remote branch, - force that git-pull will automatically retrieve data from - the remote branch independent of the configuration settings. + set up configuration so that git-pull will not retrieve data + from the remote branch, ignoring the branch.autosetupmerge + configuration variable. </p> </dd> <dt> @@ -532,7 +537,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 04-Apr-2007 18:33:30 UTC +Last updated 17-Apr-2007 08:27:40 UTC </div> </div> </body>
